Merge "API: Remove action=paraminfo 'props' and 'errors' result properties"

diff --combined RELEASE-NOTES-1.24
index 5d4fc07,47f226f..74b9692
--- 1/RELEASE-NOTES-1.24
--- 2/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@@ -131,12 -131,9 +131,12 @@@ production
  * (bug 66440) The MediaWiki web installer will now allow you to choose the skins
    to enable (from the ones included in download tarball) and decide which one
    should be the default.
 -* (bug 68085) Links of the form [[localInterwikiPrefix:languageCode:pageTitle]],
 +* (bug 68085, 68802) Links like [[localInterwikiPrefix:languageCode:pageTitle]],
    where localInterwikiPrefix is a member of the $wgLocalInterwikis array, will
 -  no longer be displayed in the sidebar when $wgInterwikiMagic is true.
 +  no longer be displayed in the sidebar when $wgInterwikiMagic is true. In a
 +  similar way, links like [[localInterwikiPrefix:File:Image.png]] and
 +  [[localInterwikiPrefix:Category:Hello]] will now render as regular links, and
 +  will not include the file or add the page to the category.
  * New special page, MyLanguages, to redirect users to subpages with localised
    versions of a page. (Integrated from Extension:Translate)
  * MediaWiki now supports multiple password types, including bcrypt and PBKDF2.
@@@ -146,13 -143,8 +146,13 @@@
    the $wgResourceModuleSkinStyles global. See the Vector skin for examples.
  * (bug 4488) There is now a preference to watch pages where the user has
    rollbacked an edit by default.
 +* (bug 15484) Users will now be redirected to the login page when they need to
 +  log in, rather than being shown a page asking them to log in and having to click
 +  another link to actually get to the login page.
 +* A JSONContent and JSONContentHandler were added for extensions to extend.
  
  === Bug fixes in 1.24 ===
 +* (bug 50572) MediaWiki:Blockip should support gender
  * (bug 49116) Footer copyright notice is now always displayed in user language
    rather than content language (same as copyright notice for editing interface).
  * (bug 62258) A bug was fixed in File::getUnscaledThumb when a height
@@@ -214,6 -206,10 +214,10 @@@
    to use for the module. This is intended for extensions that want control over
    the instantiation of their API modules, to allow for proper dependency
    injection.
+ * Removed 'props' and 'errors' from action=paraminfo, as they have extremely
+   limited use and are generally inaccurate, unmaintained, and impossible to
+   properly maintain. Also removed the corresponding methods from ApiBase and
+   the 'APIGetPossibleErrors' and 'APIGetResultProperties' hooks.
  
  === Languages updated in 1.24 ===
  

diff --combined docs/hooks.txt
index 9028288,b013a45..31590ae
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -393,16 -393,6 +393,6 @@@ descriptions
  &$module: ApiBase Module object
  &$desc: Array of parameter descriptions
  
- 'APIGetResultProperties': Use this hook to modify the properties in a module's
- result.
- &$module: ApiBase Module object
- &$properties: Array of properties
- 
- 'APIGetPossibleErrors': Use this hook to modify the module's list of possible
- errors.
- $module: ApiBase Module object
- &$possibleErrors: Array of possible errors
- 
  'APIQueryAfterExecute': After calling the execute() method of an
  action=query submodule. Use this to extend core API modules.
  &$module: Module object
@@@ -2148,7 -2138,7 +2138,7 @@@ $oldSessionID: old session i
  $newSessionID: new session id
  
  'ResourceLoaderGetConfigVars': Called at the end of
 -ResourceLoaderStartUpModule::getConfig(). Use this to export static
 +ResourceLoaderStartUpModule::getConfigSettings(). Use this to export static
  configuration variables to JavaScript. Things that depend on the current page
  or request state must be added through MakeGlobalVariablesScript instead.
  &$vars: array( variable name => value )
@@@ -2364,6 -2354,11 +2354,6 @@@ $dummy: Called when SkinTemplateToolbox
    dummy parameter with "$dummy=false" in their code and return without echoing
    any HTML to avoid creating duplicate toolbox items.
  
 -'SkinVectorStyleModules': Called when defining the list of module styles to be
 -loaded by the Vector skin.
 -$skin: SkinVector object
 -&$styles: Array of module names whose style will be loaded for the skin
 -
  'SoftwareInfo': Called by Special:Version for returning information about the
  software.
  $software: The array of software in format 'name' => 'version'. See
@@@ -2729,11 -2724,11 +2719,11 @@@ string &$error: output: message key fo
    returning false. May also be an array, where the first element is the message
    key and the remaining elements are used as parameters to the message.
  
 -'UploadVerifyFile': extra file verification, based on mime type, etc. Preferred
 +'UploadVerifyFile': extra file verification, based on MIME type, etc. Preferred
  in most cases over UploadVerification.
  object $upload: an instance of UploadBase, with all info about the upload
 -string $mime: The uploaded file's mime type, as detected by MediaWiki. Handlers
 -  will typically only apply for specific mime types.
 +string $mime: The uploaded file's MIME type, as detected by MediaWiki. Handlers
 +  will typically only apply for specific MIME types.
  object &$error: output: true if the file is valid. Otherwise, an indexed array
    representing the problem with the file, where the first element is the message
    key and the remaining elements are used as parameters to the message.